arrow git commit: ARROW-1350: [C++] Do not exclude Plasma source tree from source release

2017-08-11 Thread wesm 
Repository: arrow
Updated Branches:
  refs/heads/master 214334977 -> 63954c02f


ARROW-1350: [C++] Do not exclude Plasma source tree from source release

Author: Wes McKinney 

Closes #962 from wesm/ARROW-1350 and squashes the following commits:

5d7f87e [Wes McKinney] Do not exclude Plasma source tree from source release


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/63954c02
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/63954c02
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/63954c02

Branch: refs/heads/master
Commit: 63954c02fa2c6d8f468fa6fe93529852dacf522c
Parents: 2143349
Author: Wes McKinney 
Authored: Fri Aug 11 17:17:32 2017 -0400
Committer: Wes McKinney 
Committed: Fri Aug 11 17:17:32 2017 -0400

--
 dev/release/02-source.sh | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/arrow/blob/63954c02/dev/release/02-source.sh
--
diff --git a/dev/release/02-source.sh b/dev/release/02-source.sh
index 6e8e7e4..6ab160c 100755
--- a/dev/release/02-source.sh
+++ b/dev/release/02-source.sh
@@ -89,10 +89,6 @@ git archive $release_hash --prefix ${tag}/ | tar xf -
 rm -rf ${tag}/c_glib
 mv tmp-c_glib ${tag}/c_glib
 
-# ARROW-1244 Remove cpp/src/plasma from source release until after IP clearance
-# is resolved
-rm -rf ${tag}/cpp/src/plasma
-
 # Create new tarball from modified source directory
 tar czf ${tarball} ${tag}
 rm -rf ${tag}

arrow git commit: ARROW-1240: [JAVA] security: upgrade logback to address CVE-2017-5929 (take 2)

2017-08-11 Thread wesm 
Repository: arrow
Updated Branches:
  refs/heads/master 2972c9d3a -> b795e5cff


ARROW-1240: [JAVA] security: upgrade logback to address CVE-2017-5929 (take 2)

sorry, this was still not fixed properly.  logback version is separately 
specified in 2 places.

Fixed properly this time.

Author: Matt Darwin <(none)>
Author: Matt 

Closes #960 from mattdarwin/ARROW-1240-upgrade-logback and squashes the 
following commits:

3492f66 [Matt Darwin] upgrading logback in tools/pom.xml
206b48d [Matt Darwin] Merge branch 'master' into ARROW-1240-upgrade-logback
284a4ce [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow
bc3b6a0 [Matt] Merge pull request #1 from apache/master
3e2f676 [Matt Darwin] Merge branch 'master' into ARROW-1240-upgrade-logback
caed163 [Matt Darwin] upgrading slf4j to 1.7.25


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/b795e5cf
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/b795e5cf
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/b795e5cf

Branch: refs/heads/master
Commit: b795e5cff92c840155911f5de7a8323f0c8d3fb6
Parents: 2972c9d
Author: Matt Darwin <(none)>
Authored: Fri Aug 11 17:13:30 2017 -0400
Committer: Wes McKinney 
Committed: Fri Aug 11 17:13:30 2017 -0400

--
 java/tools/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/arrow/blob/b795e5cf/java/tools/pom.xml
--
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 8aadb44..f01f3e3 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -48,7 +48,7 @@
 
   ch.qos.logback
   logback-classic
-  1.0.13
+  1.2.3
   run

[arrow] Git Push Summary

2017-08-11 Thread wesm 
Repository: arrow
Updated Tags:  refs/tags/apache-arrow-0.6.0 [deleted] 1cfaedeeb