You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/24 21:48:09 UTC

[1/6] git commit: Don't require the sysctl file to exist when deleting it

Updated Branches:
  refs/heads/cassandra-1.2 9eddaa8ff -> 1f4070dbf
  refs/heads/cassandra-2.0 21e6ec6d8 -> 8bdd4733b
  refs/heads/trunk fb7e0b1c2 -> 723310252


Don't require the sysctl file to exist when deleting it


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

Branch: refs/heads/cassandra-1.2
Commit: 1f4070dbf29310962e3d632fe570ec3d8b61f887
Parents: 9eddaa8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Oct 24 14:46:00 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Oct 24 14:46:00 2013 -0500

----------------------------------------------------------------------
 debian/cassandra.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f4070db/debian/cassandra.postinst
----------------------------------------------------------------------
diff --git a/debian/cassandra.postinst b/debian/cassandra.postinst
index 9591459..752ff1f 100644
--- a/debian/cassandra.postinst
+++ b/debian/cassandra.postinst
@@ -45,7 +45,7 @@ case "$1" in
             echo "vm.max_map_count to 1048575 in the host." >&2
             echo >&2
             echo "Deleting the local sysctl.d/cassandra.conf." >&2
-            rm -v /etc/sysctl.d/cassandra.conf
+            rm -vf /etc/sysctl.d/cassandra.conf
         fi
     ;;

[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 8bdd4733bf8412eca18e9b0b436e9def4c77a8d3
Parents: 21e6ec6 1f4070d
Author: Brandon Williams <br...@apache.org>
Authored: Thu Oct 24 14:46:21 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Oct 24 14:46:21 2013 -0500

----------------------------------------------------------------------
 debian/cassandra.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------

[2/6] git commit: Don't require the sysctl file to exist when deleting it

Posted by br...@apache.org.
Don't require the sysctl file to exist when deleting it


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

Branch: refs/heads/cassandra-2.0
Commit: 1f4070dbf29310962e3d632fe570ec3d8b61f887
Parents: 9eddaa8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Oct 24 14:46:00 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Oct 24 14:46:00 2013 -0500

----------------------------------------------------------------------
 debian/cassandra.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f4070db/debian/cassandra.postinst
----------------------------------------------------------------------
diff --git a/debian/cassandra.postinst b/debian/cassandra.postinst
index 9591459..752ff1f 100644
--- a/debian/cassandra.postinst
+++ b/debian/cassandra.postinst
@@ -45,7 +45,7 @@ case "$1" in
             echo "vm.max_map_count to 1048575 in the host." >&2
             echo >&2
             echo "Deleting the local sysctl.d/cassandra.conf." >&2
-            rm -v /etc/sysctl.d/cassandra.conf
+            rm -vf /etc/sysctl.d/cassandra.conf
         fi
     ;;

[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.0
Commit: 8bdd4733bf8412eca18e9b0b436e9def4c77a8d3
Parents: 21e6ec6 1f4070d
Author: Brandon Williams <br...@apache.org>
Authored: Thu Oct 24 14:46:21 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Oct 24 14:46:21 2013 -0500

----------------------------------------------------------------------
 debian/cassandra.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------

[3/6] git commit: Don't require the sysctl file to exist when deleting it

Posted by br...@apache.org.
Don't require the sysctl file to exist when deleting it


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

Branch: refs/heads/trunk
Commit: 1f4070dbf29310962e3d632fe570ec3d8b61f887
Parents: 9eddaa8
Author: Brandon Williams <br...@apache.org>
Authored: Thu Oct 24 14:46:00 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Oct 24 14:46:00 2013 -0500

----------------------------------------------------------------------
 debian/cassandra.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f4070db/debian/cassandra.postinst
----------------------------------------------------------------------
diff --git a/debian/cassandra.postinst b/debian/cassandra.postinst
index 9591459..752ff1f 100644
--- a/debian/cassandra.postinst
+++ b/debian/cassandra.postinst
@@ -45,7 +45,7 @@ case "$1" in
             echo "vm.max_map_count to 1048575 in the host." >&2
             echo >&2
             echo "Deleting the local sysctl.d/cassandra.conf." >&2
-            rm -v /etc/sysctl.d/cassandra.conf
+            rm -vf /etc/sysctl.d/cassandra.conf
         fi
     ;;

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 72331025206778a8bf97cb93a99eabf1ad98aae0
Parents: fb7e0b1 8bdd473
Author: Brandon Williams <br...@apache.org>
Authored: Thu Oct 24 14:46:33 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Oct 24 14:46:33 2013 -0500

----------------------------------------------------------------------
 debian/cassandra.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------