HBASE-15822 Move to the latest docker base image
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5bb7fa8b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5bb7fa8b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5bb7fa8b Branch: refs/heads/HBASE-14850 Commit: 5bb7fa8b832a3134f83b7d94404494ba07f0bd4d Parents: df14a6a Author: Elliott Clark <elli...@fb.com> Authored: Tue May 31 10:42:45 2016 -0700 Committer: Elliott Clark <ecl...@apache.org> Committed: Mon Jul 11 16:47:26 2016 -0700 ---------------------------------------------------------------------- hbase-native-client/Dockerfile | 2 +- hbase-native-client/if/RPC.proto | 1 + hbase-native-client/if/WAL.proto | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5bb7fa8b/hbase-native-client/Dockerfile ---------------------------------------------------------------------- diff --git a/hbase-native-client/Dockerfile b/hbase-native-client/Dockerfile index be0cbc6..ca87523 100644 --- a/hbase-native-client/Dockerfile +++ b/hbase-native-client/Dockerfile @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM pjameson/buck-folly-watchman:20160425 +FROM pjameson/buck-folly-watchman:20160511 ARG CC=/usr/bin/gcc-5 ARG CXX=/usr/bin/g++-5 http://git-wip-us.apache.org/repos/asf/hbase/blob/5bb7fa8b/hbase-native-client/if/RPC.proto ---------------------------------------------------------------------- diff --git a/hbase-native-client/if/RPC.proto b/hbase-native-client/if/RPC.proto index 59bb03d..8413d25 100644 --- a/hbase-native-client/if/RPC.proto +++ b/hbase-native-client/if/RPC.proto @@ -125,6 +125,7 @@ message RequestHeader { // 0 is NORMAL priority. 200 is HIGH. If no priority, treat it as NORMAL. // See HConstants. optional uint32 priority = 6; + optional uint32 timeout = 7; } message ResponseHeader { http://git-wip-us.apache.org/repos/asf/hbase/blob/5bb7fa8b/hbase-native-client/if/WAL.proto ---------------------------------------------------------------------- diff --git a/hbase-native-client/if/WAL.proto b/hbase-native-client/if/WAL.proto index cb9bd8f..2061b22 100644 --- a/hbase-native-client/if/WAL.proto +++ b/hbase-native-client/if/WAL.proto @@ -44,9 +44,9 @@ message WALKey { required uint64 log_sequence_number = 3; required uint64 write_time = 4; /* - This parameter is deprecated in favor of clusters which + This parameter is deprecated in favor of clusters which contains the list of clusters that have consumed the change. - It is retained so that the log created by earlier releases (0.94) + It is retained so that the log created by earlier releases (0.94) can be read by the newer releases. */ optional UUID cluster_id = 5 [deprecated=true]; @@ -132,6 +132,7 @@ message StoreDescriptor { required bytes family_name = 1; required string store_home_dir = 2; //relative to region dir repeated string store_file = 3; // relative to store dir + optional uint64 store_file_size_bytes = 4; // size of store file } /**