commit 337e073db7c78defc8df8f373e664cdabca0f636
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Fri Jan 18 20:27:14 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Fri Jan 18 20:27:14 2013 -0800
tree a85385cb559f2000b3921517161894221e31a171
parent f567412b49aa6a0ea739889b010ebb494c70c1e7

minor changes in actionlog

src/action-item.proto

diff --git a/src/action-item.proto b/src/action-item.proto
index 1008ba6..1bba70f 100644
--- a/src/action-item.proto
+++ b/src/action-item.proto
@@ -2,22 +2,22 @@
 {
   enum ActionType
   {
-    UPDATE = 1;
-    DELETE = 2;
+    UPDATE = 0;
+    DELETE = 1;
   }
-  required ActionType action = 14;
+  required ActionType action = 1;
 
-  required string filename = 1;
-  required uint64 version = 2;
-  required uint32 timestamp = 3;
-  optional uint64 seg_num = 4;
-  optional bytes  file_hash = 5;
+  required string filename = 2;
+  required uint64 version = 3;
+  required uint32 timestamp = 4;
+  optional uint64 seg_num = 5;
+  optional bytes  file_hash = 6;
 
-  optional uint32 mtime = 6;
-  optional uint32 mode  = 7;
-  // optional uint32 atime = 8;
-  // optional uint32 ctime = 9;
+  optional uint32 mtime = 7;
+  optional uint32 mode  = 8;
+  // optional uint32 atime = 9;
+  // optional uint32 ctime = 10;
 
-  optional bytes  parent_device_name = 12;
-  optional uint64 parent_seq_no = 13;
+  optional bytes  parent_device_name = 11;
+  optional uint64 parent_seq_no = 12;
 }

src/action-log.cc

diff --git a/src/action-log.cc b/src/action-log.cc
index e15bbc6..24114a0 100644
--- a/src/action-log.cc
+++ b/src/action-log.cc
@@ -20,7 +20,6 @@
  */
 
 #include "action-log.h"
-#include <action-item.pb.h>
 
 using namespace boost;
 using namespace std;

src/action-log.h

diff --git a/src/action-log.h b/src/action-log.h
index ed7a76a..28b221a 100644
--- a/src/action-log.h
+++ b/src/action-log.h
@@ -24,6 +24,7 @@
 
 #include "sync-log.h"
 #include <boost/tuple/tuple.hpp>
+#include <action-item.pb.h>
 #include <ccnx-wrapper.h>
 
 class ActionLog;