You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by jd...@apache.org on 2016/11/14 16:10:07 UTC
[1/2] kudu git commit: [doc] fixed misprint in share_ptr pros item
icon
Repository: kudu
Updated Branches:
refs/heads/master 88b02349d -> 8592efc5f
[doc] fixed misprint in share_ptr pros item icon
Change-Id: I179a4525408b78fc34bb35534dc5809e63d2fc50
Reviewed-on: http://gerrit.cloudera.org:8080/5065
Reviewed-by: Will Berkeley <wd...@gmail.com>
Tested-by: Kudu Jenkins
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/cce47a63
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/cce47a63
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/cce47a63
Branch: refs/heads/master
Commit: cce47a635d015aa813f68182f57f89b76841c4bb
Parents: 88b0234
Author: Alexey Serbin <as...@cloudera.com>
Authored: Mon Nov 14 07:30:34 2016 -0800
Committer: Will Berkeley <wd...@gmail.com>
Committed: Mon Nov 14 15:55:35 2016 +0000
----------------------------------------------------------------------
docs/contributing.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/cce47a63/docs/contributing.adoc
----------------------------------------------------------------------
diff --git a/docs/contributing.adoc b/docs/contributing.adoc
index 78e20ae..885b9e2 100644
--- a/docs/contributing.adoc
+++ b/docs/contributing.adoc
@@ -231,7 +231,7 @@ object deriving from a special base class
* icon:plus-circle[role="green",alt="pro"] supports the `weak_ptr` use cases:
** a temporary ownership when an object needs to be accessed only if it exists
** break circular references of `shared_ptr`, if any exists due to aggregation
-* icon:minus-circle[role="green",alt="pro"] you can convert from the
+* icon:plus-circle[role="green",alt="pro"] you can convert from the
`shared_ptr` into the `weak_ptr` and back
* icon:plus-circle[role="green",alt="pro"] if creating an instance with
`std::make_shared<>()` only one allocation is made (since {cpp}11;
[2/2] kudu git commit: Bump version to 1.2.0-SNAPSHOT
Posted by jd...@apache.org.
Bump version to 1.2.0-SNAPSHOT
Change-Id: I624b7fa917abab0b29daf657714ebe976e48b46e
Reviewed-on: http://gerrit.cloudera.org:8080/5060
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <to...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/8592efc5
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/8592efc5
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/8592efc5
Branch: refs/heads/master
Commit: 8592efc5ffa4f69854e0133c9673317a24c932c5
Parents: cce47a6
Author: Jean-Daniel Cryans <jd...@apache.org>
Authored: Sat Nov 12 14:10:12 2016 -0800
Committer: Jean-Daniel Cryans <jd...@apache.org>
Committed: Mon Nov 14 16:04:25 2016 +0000
----------------------------------------------------------------------
java/interface-annotations/pom.xml | 2 +-
java/kudu-client-tools/pom.xml | 2 +-
java/kudu-client/pom.xml | 2 +-
java/kudu-csd/pom.xml | 4 ++--
java/kudu-csd/src/descriptor/service.sdl | 2 +-
java/kudu-flume-sink/pom.xml | 2 +-
java/kudu-mapreduce/pom.xml | 2 +-
java/kudu-spark/pom.xml | 2 +-
java/pom.xml | 2 +-
python/setup.py | 2 +-
version.txt | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/interface-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/java/interface-annotations/pom.xml b/java/interface-annotations/pom.xml
index 62e3a26..752b553 100644
--- a/java/interface-annotations/pom.xml
+++ b/java/interface-annotations/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>interface-annotations</artifactId>
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/kudu-client-tools/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-client-tools/pom.xml b/java/kudu-client-tools/pom.xml
index 7913b4b..f9d998b 100644
--- a/java/kudu-client-tools/pom.xml
+++ b/java/kudu-client-tools/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>kudu-client-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/kudu-client/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-client/pom.xml b/java/kudu-client/pom.xml
index 823dc15..cb5b55f 100644
--- a/java/kudu-client/pom.xml
+++ b/java/kudu-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>kudu-client</artifactId>
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/kudu-csd/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-csd/pom.xml b/java/kudu-csd/pom.xml
index 8ee5fd2..04a5c31 100644
--- a/java/kudu-csd/pom.xml
+++ b/java/kudu-csd/pom.xml
@@ -19,12 +19,12 @@ limitations under the License.
<parent>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<groupId>com.cloudera.csd</groupId>
<artifactId>KUDU</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>The Kudu CSD</name>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/kudu-csd/src/descriptor/service.sdl
----------------------------------------------------------------------
diff --git a/java/kudu-csd/src/descriptor/service.sdl b/java/kudu-csd/src/descriptor/service.sdl
index c2cd823..e363e10 100644
--- a/java/kudu-csd/src/descriptor/service.sdl
+++ b/java/kudu-csd/src/descriptor/service.sdl
@@ -18,7 +18,7 @@
"name" : "KUDU",
"label" : "Kudu (Beta)",
"description" : "Kudu is a true column store for the Hadoop ecosystem. <span class=\"error\">Kudu is currently in Beta and is not supported. Before adding this service, ensure that you have installed the Kudu binaries, which are not included in CDH.</span>",
- "version" : "1.1.0",
+ "version" : "1.2.0",
"compatibility" : {
"generation" : 1
},
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/kudu-flume-sink/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-flume-sink/pom.xml b/java/kudu-flume-sink/pom.xml
index 0afa9f5..98a2106 100644
--- a/java/kudu-flume-sink/pom.xml
+++ b/java/kudu-flume-sink/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>kudu-parent</artifactId>
<groupId>org.apache.kudu</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>kudu-flume-sink</artifactId>
<name>Kudu Flume NG Sink</name>
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/kudu-mapreduce/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-mapreduce/pom.xml b/java/kudu-mapreduce/pom.xml
index e0c1132..fceab74 100644
--- a/java/kudu-mapreduce/pom.xml
+++ b/java/kudu-mapreduce/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>kudu-mapreduce</artifactId>
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/kudu-spark/pom.xml
----------------------------------------------------------------------
diff --git a/java/kudu-spark/pom.xml b/java/kudu-spark/pom.xml
index 13b58d8..707dac9 100644
--- a/java/kudu-spark/pom.xml
+++ b/java/kudu-spark/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>kudu-${spark.version.label}_${scala.binary.version}</artifactId>
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/java/pom.xml
----------------------------------------------------------------------
diff --git a/java/pom.xml b/java/pom.xml
index 451545d..b620471 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.kudu</groupId>
<artifactId>kudu-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- inherit from the ASF POM for distribution management -->
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/python/setup.py
----------------------------------------------------------------------
diff --git a/python/setup.py b/python/setup.py
index 4681abd..6e84680 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -32,7 +32,7 @@ if Cython.__version__ < '0.21.0':
raise Exception('Please upgrade to Cython 0.21.0 or newer')
MAJOR = 1
-MINOR = 1
+MINOR = 2
MICRO = 0
VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
ISRELEASED = True
http://git-wip-us.apache.org/repos/asf/kudu/blob/8592efc5/version.txt
----------------------------------------------------------------------
diff --git a/version.txt b/version.txt
index 5902d52..468e6c3 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.1.0-SNAPSHOT
+1.2.0-SNAPSHOT