Imported Upstream version 1.12

Change-Id: I805c88354ef3df2e1e06d3e84195f7aeab694868
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/AUTHORS b/AUTHORS
index 27a9407e52fdc517f3ab28741e0426c3180d444e..fc40194ab94f41405bd48d085b9f3fcbe1704234 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,3 +6,6 @@ Google Inc.
 # Initial version authors:
 Jeffrey Dean <jeff@google.com>
 Sanjay Ghemawat <sanjay@google.com>
+
+# Partial list of contributors:
+Kevin Regan <kevin.d.regan@gmail.com>

diff --git a/Makefile b/Makefile
index 748d12270d0581e2dff33633ce75c62d4d7ff53a..96af7765be41edc6b8e83c646efcdb3b9c99d025 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ SHARED = $(SHARED1)
 else
 # Update db.h if you change these.
 SHARED_MAJOR = 1
-SHARED_MINOR = 11
+SHARED_MINOR = 12
 SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
 SHARED2 = $(SHARED1).$(SHARED_MAJOR)
 SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)

diff --git a/include/leveldb/db.h b/include/leveldb/db.h
index 27ea76eba4eab6ce76346095f83024cb4b8bd63a..da8b11a8c05b054ef231ba34d88ef51ec1e55eb0 100644 (file)
--- a/include/leveldb/db.h
+++ b/include/leveldb/db.h
@@ -14,7 +14,7 @@ namespace leveldb {
 
 // Update Makefile if you change these
 static const int kMajorVersion = 1;
-static const int kMinorVersion = 11;
+static const int kMinorVersion = 12;
 
 struct Options;
 struct ReadOptions;

diff --git a/issues/issue178_test.cc b/issues/issue178_test.cc
index c0a21f03d6432ba1f566a41018da341e8e5c7fde..1b1cf8bb28da5cf6a117ffdc4cb6527ef1585d6b 100644 (file)
--- a/issues/issue178_test.cc
+++ b/issues/issue178_test.cc
@@ -1,3 +1,7 @@
+// Copyright (c) 2013 The LevelDB Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file. See the AUTHORS file for names of contributors.
+
 // Test for issue 178: a manual compaction causes deleted data to reappear.
 #include <iostream>
 #include <sstream>