You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2018/11/01 09:18:36 UTC
[1/2] ignite git commit: IGNITE-10036 Visor CMD: Moved
"node_startup_by_ssh.sample.ini" to "/config/visor-cmd".
Repository: ignite
Updated Branches:
refs/heads/ignite-2.7 6d8322207 -> cabcc2127
IGNITE-10036 Visor CMD: Moved "node_startup_by_ssh.sample.ini" to "/config/visor-cmd".
(cherry picked from commit 0e7dc7196f4fe7f150e9c633fbe73b3dd8765a16)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc69abb1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc69abb1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc69abb1
Branch: refs/heads/ignite-2.7
Commit: bc69abb1480c63189fa63d36709defa11ff96eb9
Parents: 239a946
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Oct 31 17:35:25 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Oct 31 17:54:43 2018 +0700
----------------------------------------------------------------------
.../visorcmd/node_startup_by_ssh.sample.ini | 74 ------------------
config/visor-cmd/node_startup_by_ssh.sample.ini | 79 ++++++++++++++++++++
2 files changed, 79 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc69abb1/bin/include/visorcmd/node_startup_by_ssh.sample.ini
----------------------------------------------------------------------
diff --git a/bin/include/visorcmd/node_startup_by_ssh.sample.ini b/bin/include/visorcmd/node_startup_by_ssh.sample.ini
deleted file mode 100644
index e50ff29..0000000
--- a/bin/include/visorcmd/node_startup_by_ssh.sample.ini
+++ /dev/null
@@ -1,74 +0,0 @@
-;Licensed to the Apache Software Foundation (ASF) under one or more
-;contributor license agreements. See the NOTICE file distributed with
-;this work for additional information regarding copyright ownership.
-;The ASF licenses this file to You under the Apache License, Version 2.0
-;(the "License"); you may not use this file except in compliance with
-;the License. You may obtain a copy of the License at
-;
-;http://www.apache.org/licenses/LICENSE-2.0
-;
-;Unless required by applicable law or agreed to in writing, software
-;distributed under the License is distributed on an "AS IS" BASIS,
-;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-;See the License for the specific language governing permissions and
-;limitations under the License.
-
-# Section with settings for host1:
-[host1]
-# IP address or host name:
-host=192.168.1.1
-
-# SSH port:
-port=2200
-
-# SSH login:
-uname=userName
-
-# SSH password:
-passwd=password
-
-# SSH key path:
-key=~/.ssh/id_rsa
-
-# Number of nodes to start:
-nodes=1
-
-# Ignite home path:
-igniteHome=/usr/lib/ignite
-
-# Ignite config path:
-cfg=examples/example-ignite.xml
-
-# Ignite node start script:
-script=bin/ignite.sh
-
-# Section with settings for host2:
-[host2]
-# IP address or host name:
-host=192.168.1.2
-
-# Section with default settings. Used if value not defined in host section.
-[defaults]
-# SSH port:
-port=22
-
-# SSH login:
-uname=userName
-
-# SSH password:
-passwd=password
-
-# SSH key path:
-key=~/.ssh/id_rsa
-
-# Number of nodes to start:
-nodes=3
-
-# Ignite home path:
-igniteHome=/usr/lib/ignite
-
-# Ignite config path:
-cfg=examples/example-ignite.xml
-
-# Ignite node start script:
-script=bin/ignite.sh
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc69abb1/config/visor-cmd/node_startup_by_ssh.sample.ini
----------------------------------------------------------------------
diff --git a/config/visor-cmd/node_startup_by_ssh.sample.ini b/config/visor-cmd/node_startup_by_ssh.sample.ini
new file mode 100644
index 0000000..f1d8e01
--- /dev/null
+++ b/config/visor-cmd/node_startup_by_ssh.sample.ini
@@ -0,0 +1,79 @@
+;Licensed to the Apache Software Foundation (ASF) under one or more
+;contributor license agreements. See the NOTICE file distributed with
+;this work for additional information regarding copyright ownership.
+;The ASF licenses this file to You under the Apache License, Version 2.0
+;(the "License"); you may not use this file except in compliance with
+;the License. You may obtain a copy of the License at
+;
+;http://www.apache.org/licenses/LICENSE-2.0
+;
+;Unless required by applicable law or agreed to in writing, software
+;distributed under the License is distributed on an "AS IS" BASIS,
+;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;See the License for the specific language governing permissions and
+;limitations under the License.
+
+# ==================================================================
+# This is a sample file for Visor CMD to use with "start" command.
+# More info: https://apacheignite-tools.readme.io/docs/start-command
+# ==================================================================
+
+# Section with settings for host1:
+[host1]
+# IP address or host name:
+host=192.168.1.1
+
+# SSH port:
+port=2200
+
+# SSH login:
+uname=userName
+
+# SSH password:
+passwd=password
+
+# SSH key path:
+key=~/.ssh/id_rsa
+
+# Number of nodes to start:
+nodes=1
+
+# Ignite home path:
+igniteHome=/usr/lib/ignite
+
+# Ignite config path:
+cfg=examples/example-ignite.xml
+
+# Ignite node start script:
+script=bin/ignite.sh
+
+# Section with settings for host2:
+[host2]
+# IP address or host name:
+host=192.168.1.2
+
+# Section with default settings. Used if value not defined in host section.
+[defaults]
+# SSH port:
+port=22
+
+# SSH login:
+uname=userName
+
+# SSH password:
+passwd=password
+
+# SSH key path:
+key=~/.ssh/id_rsa
+
+# Number of nodes to start:
+nodes=3
+
+# Ignite home path:
+igniteHome=/usr/lib/ignite
+
+# Ignite config path:
+cfg=examples/example-ignite.xml
+
+# Ignite node start script:
+script=bin/ignite.sh
[2/2] ignite git commit: Merge branch 'ignite-2.7' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2.7.1
Posted by vo...@apache.org.
Merge branch 'ignite-2.7' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2.7.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cabcc212
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cabcc212
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cabcc212
Branch: refs/heads/ignite-2.7
Commit: cabcc2127f5706a251b6735c9c0601a38baecb55
Parents: bc69abb 6d83222
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Nov 1 11:36:49 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Nov 1 11:36:49 2018 +0300
----------------------------------------------------------------------
examples/pom-standalone-lgpl.xml | 2 +-
examples/pom-standalone.xml | 2 +-
.../suite/IgniteJdbcDriverMvccTestSuite.java | 2 +
...ctionFinishOnDeactivatedClusterSelfTest.java | 156 +++++++++++++++++++
.../encryption/GridEncryptionManager.java | 3 +
.../persistence/pagemem/PageMemoryImpl.java | 8 +-
.../processors/query/GridQueryProcessor.java | 22 +--
...gnitePageMemReplaceDelayedWriteUnitTest.java | 15 ++
.../processors/query/h2/IgniteH2Indexing.java | 45 ++++--
9 files changed, 225 insertions(+), 30 deletions(-)
----------------------------------------------------------------------