nifi git commit: NIFI-4786 Allow Expression Evaluation to Kinesis/Firehose Stream Name

2018-01-27 Thread jwing 
Repository: nifi
Updated Branches:
  refs/heads/master c4e2ac7cd -> 8bdc2910e


NIFI-4786 Allow Expression Evaluation to Kinesis/Firehose Stream Name

Signed-off-by: James Wing 

This closes #2409.


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

Branch: refs/heads/master
Commit: 8bdc2910e1e0da4e49dd45123327b4b1d37ca640
Parents: c4e2ac7
Author: dorian.bugeja 
Authored: Wed Jan 17 11:22:39 2018 +0100
Committer: James Wing 
Committed: Sat Jan 27 16:01:09 2018 -0800

--
 .../kinesis/AbstractBaseKinesisProcessor.java   | 12 +--
 .../AbstractKinesisFirehoseProcessor.java   |  2 +-
 .../stream/AbstractKinesisStreamProcessor.java  |  2 +-
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 10 ++
 .../kinesis/firehose/PutKinesisFirehose.java| 96 +++
 .../aws/kinesis/stream/PutKinesisStream.java| 99 
 6 files changed, 133 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/8bdc2910/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/AbstractBaseKinesisProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/AbstractBaseKinesisProcessor.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/AbstractBaseKinesisProcessor.java
index e559820..a43359e 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/AbstractBaseKinesisProcessor.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/AbstractBaseKinesisProcessor.java
@@ -64,16 +64,16 @@ public abstract class 
AbstractBaseKinesisProcessor filterMessagesByMaxSize(final ProcessSession 
session, final int batchSize, final long maxBufferSizeBytes, final String 
streamName, String message) {
+protected List filterMessagesByMaxSize(final ProcessSession 
session, final int batchSize, final long maxBufferSizeBytes, String message) {
 List flowFiles = new ArrayList(batchSize);
 
 long currentBufferSizeBytes = 0;
@@ -85,7 +85,7 @@ public abstract class AbstractBaseKinesisProcessor MAX_MESSAGE_SIZE) {
-flowFileCandidate = handleFlowFileTooBig(session, 
flowFileCandidate, streamName, message);
+flowFileCandidate = handleFlowFileTooBig(session, 
flowFileCandidate, message);
 continue;
 }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/8bdc2910/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
--
diff --git 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
index ca15653..bf91e9b 100644
--- 
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
+++ 
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/firehose/AbstractKinesisFirehoseProcessor.java
@@ -34,7 +34,7 @@ public abstract class AbstractKinesisFirehoseProcessor 
extends AbstractBaseKines
 public static final PropertyDescriptor 
KINESIS_FIREHOSE_DELIVERY_STREAM_NAME = new PropertyDescriptor.Builder()
 .name("Amazon Kinesis Firehose Delivery Stream Name")
 .description("The name of kinesis firehose delivery stream")
-.expressionLanguageSupported(false)
+.expressionLanguageSupported(true)
 .required(true)
 .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
 .build();

http://git-wip-us.apache.org/repos/asf/nifi/blob/8bdc2910/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/kinesis/stream/AbstractKinesisStreamProcessor.java
--
diff --git

svn commit: r1822429 - /nifi/site/trunk/minifi/download.html

2018-01-27 Thread aldrin 
Author: aldrin
Date: Sat Jan 27 18:43:11 2018
New Revision: 1822429

URL: http://svn.apache.org/viewvc?rev=1822429=rev
Log:
MINIFICPP-379 Providing links to 0.4.0 release artifacts.

Modified:
nifi/site/trunk/minifi/download.html

Modified: nifi/site/trunk/minifi/download.html
URL: 
http://svn.apache.org/viewvc/nifi/site/trunk/minifi/download.html?rev=1822429=1822428=1822429=diff
==
--- nifi/site/trunk/minifi/download.html (original)
+++ nifi/site/trunk/minifi/download.html Sat Jan 27 18:43:11 2018
@@ -196,6 +196,54 @@
 
 MiNiFi C++
 
+  cpp-0.4.0
+  
+  
+  Sources:
+  
+  https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz;>nifi-minifi-cpp-0.4.0-source.tar.gz
+( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz.asc;>asc,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz.md5;>md5,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz.sha1;>sha1,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz.sha256;>sha256
 )
+  
+  
+  
+Note: If you experience any issues with 
building, please try removing Scanner.cpp, Parser.hpp, Parser.cpp, *.hh from 
the extensions/expression-language folder and rebuild
+  
+  
+  
+  Binaries
+  
+  Linux - RHEL Based Distributions - x86_64
+  https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz;>nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz
+( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz.asc;>asc,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz.md5;>md5,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz.sha1;>sha1,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz.sha256;>sha256
 )
+  
+  Linux - Debian Based Distributions - x86_64
+  https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz;>nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz
+( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz.asc;>asc,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz.md5;>md5,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz.sha1;>sha1,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz.sha256;>sha256
 )
+  
+  Darwin (OS X)
+  https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz;>nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz
+( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz.asc;>asc,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz.md5;>md5,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz.sha1;>sha1,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz.sha256;>sha256
 )
+  
+  
+  
+
+  https://cwiki.apache.org/confluence/display/MINIFI/Release+Notes#ReleaseNotes-Versioncpp-0.4.0;>Release
 Notes
+  
+  
+
+
   cpp-0.3.0
   
   
@@ -242,7 +290,7 @@
 
 MiNiFi Toolkit Binaries
 
-  0.4.0 - Compatible with MiNiFi Java 0.4.0+
+  0.4.0 - Compatible with MiNiFi Java & C++ 0.4.0+

nifi-site git commit: MINIFICPP-379 Updating site with MiNiFi C++ 0.4.0 release artifacts.

2018-01-27 Thread aldrin 
Repository: nifi-site
Updated Branches:
  refs/heads/master 20f193599 -> 0014aaa1e


MINIFICPP-379 Updating site with MiNiFi C++ 0.4.0 release artifacts.


Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/0014aaa1
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/0014aaa1
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/0014aaa1

Branch: refs/heads/master
Commit: 0014aaa1e3bbe7984786297e99812207ec3c4e2e
Parents: 20f1935
Author: Aldrin Piri 
Authored: Sat Jan 27 13:42:18 2018 -0500
Committer: Aldrin Piri 
Committed: Sat Jan 27 13:42:18 2018 -0500

--
 src/pages/html/minifi/download.hbs | 50 -
 1 file changed, 49 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/0014aaa1/src/pages/html/minifi/download.hbs
--
diff --git a/src/pages/html/minifi/download.hbs 
b/src/pages/html/minifi/download.hbs
index 98e791f..e8c2546 100644
--- a/src/pages/html/minifi/download.hbs
+++ b/src/pages/html/minifi/download.hbs
@@ -95,6 +95,54 @@ title: Apache NiFi - MiNiFi Downloads
 
 MiNiFi C++
 
+  cpp-0.4.0
+  
+  
+  Sources:
+  
+  https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz;>nifi-minifi-cpp-0.4.0-source.tar.gz
+( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz.asc;>asc,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz.md5;>md5,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz.sha1;>sha1,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-source.tar.gz.sha256;>sha256
 )
+  
+  
+  
+Note: If you experience any issues with 
building, please try removing Scanner.cpp, Parser.hpp, Parser.cpp, *.hh from 
the extensions/expression-language folder and rebuild
+  
+  
+  
+  Binaries
+  
+  Linux - RHEL Based Distributions - x86_64
+  https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz;>nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz
+( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz.asc;>asc,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz.md5;>md5,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz.sha1;>sha1,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-rhel.tar.gz.sha256;>sha256
 )
+  
+  Linux - Debian Based Distributions - x86_64
+  https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz;>nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz
+( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz.asc;>asc,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz.md5;>md5,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz.sha1;>sha1,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-linux-debian.tar.gz.sha256;>sha256
 )
+  
+  Darwin (OS X)
+  https://www.apache.org/dyn/closer.lua?path=/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz;>nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz
+( https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz.asc;>asc,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz.md5;>md5,
+  https://www.apache.org/dist/nifi/nifi-minifi-cpp/0.4.0/nifi-minifi-cpp-0.4.0-bin-darwin.tar.gz.sha1;>sha1,
+

[jira] [Created] (MINIFI-433) PG Variable Registry support in templates

2018-01-27 Thread Pierre Villard (JIRA) 
Pierre Villard created MINIFI-433:
-

 Summary: PG Variable Registry support in templates
 Key: MINIFI-433
 URL: https://issues.apache.org/jira/browse/MINIFI-433
 Project: Apache NiFi MiNiFi
  Issue Type: Improvement
Reporter: Pierre Villard


Right now if a NiFi template contains a {{}} block to define a 
variable registry at process group level, this is not reflected into the yaml 
generated template used by MiNiFi agents. This would be very useful when 
templates are deployed to MiNiFi agents via a NiFi registry/C2 approach.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

nifi-minifi-cpp git commit: MINIFICPP-379 Incrementing versions for next development iteration.

2018-01-27 Thread aldrin 
Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/master c05d46775 -> 591445e6c


MINIFICPP-379 Incrementing versions for next development iteration.


Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/591445e6
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/591445e6
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/591445e6

Branch: refs/heads/master
Commit: 591445e6c5f0afa10aef9ebd6bd292ac4002412b
Parents: c05d467
Author: Aldrin Piri 
Authored: Sat Jan 27 13:33:01 2018 -0500
Committer: Aldrin Piri 
Committed: Sat Jan 27 13:33:01 2018 -0500

--
 README.md  | 12 ++--
 conf/minifi.properties |  2 +-
 docker/DockerVerify.sh |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/591445e6/README.md
--
diff --git a/README.md b/README.md
index 6a7e584..4bb0b6f 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ MiNiFi - C++ supports the following processors:
 * [UnfocusArchiveEntry](PROCESSORS.md#unfocusarchiveentry)
 
 ## Caveats
-* 0.4.0 represents a non-GA release, APIs and interfaces are subject to change
+* 0.5.0 represents a non-GA release, APIs and interfaces are subject to change
 * Build and usage currently only supports Linux and OS X environments. MiNiFi 
C++ can be built and run through the Windows Subsystem for Linux but we provide 
no support for this platform.
 * Provenance events generation is supported and are persisted using RocksDB. 
Volatile repositories can be used on systems without persistent storage.
 
@@ -345,7 +345,7 @@ $ sudo brew install libpcap
   CPack: Install projects
   CPack: - Install directory: ~/Development/code/apache/nifi-minifi-cpp
   CPack: Create package
-  CPack: - package: 
~/Development/code/apache/nifi-minifi-cpp/build/nifi-minifi-cpp-0.1.0-bin.tar.gz
 generated.
+  CPack: - package: 
~/Development/code/apache/nifi-minifi-cpp/build/nifi-minifi-cpp-0.5.0-bin.tar.gz
 generated.
   ```
 
 - Create a source assembly located in your build directory with suffix 
-source.tar.gz
@@ -357,18 +357,18 @@ $ sudo brew install libpcap
   CPack: Install projects
   CPack: - Install directory: ~/Development/code/apache/nifi-minifi-cpp
   CPack: Create package
-  CPack: - package: 
~/Development/code/apache/nifi-minifi-cpp/build/nifi-minifi-cpp-0.1.0-source.tar.gz
 generated.
+  CPack: - package: 
~/Development/code/apache/nifi-minifi-cpp/build/nifi-minifi-cpp-0.5.0-source.tar.gz
 generated.
   ```
 
 - (Optional) Create a Docker image from the resulting binary assembly output 
from "make package".
 ```
 ~/Development/code/apache/nifi-minifi-cpp/build
 $ make docker
-NiFi-MiNiFi-CPP Version: 0.4.0
+NiFi-MiNiFi-CPP Version: 0.5.0
 Current Working Directory: 
/Users/jdyer/Development/github/nifi-minifi-cpp/docker
 CMake Source Directory: /Users/jdyer/Development/github/nifi-minifi-cpp
-MiNiFi Package: nifi-minifi-cpp-0.4.0-bin.tar.gz
-Docker Command: 'docker build --build-arg UID=1000 --build-arg GID=1000 
--build-arg MINIFI_VERSION=0.4.0 --build-arg 
MINIFI_PACKAGE=nifi-minifi-cpp-0.4.0-bin.tar.gz -t apacheminificpp:0.4.0 .'
+MiNiFi Package: nifi-minifi-cpp-0.5.0-bin.tar.gz
+Docker Command: 'docker build --build-arg UID=1000 --build-arg GID=1000 
--build-arg MINIFI_VERSION=0.5.0 --build-arg 
MINIFI_PACKAGE=nifi-minifi-cpp-0.5.0-bin.tar.gz -t apacheminificpp:0.5.0 .'
 Sending build context to Docker daemon 777.2 kB
 Step 1 : FROM alpine:3.5
  ---> 88e169ea8f46

http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/591445e6/conf/minifi.properties
--
diff --git a/conf/minifi.properties b/conf/minifi.properties
index a528c01..6668754 100644
--- a/conf/minifi.properties
+++ b/conf/minifi.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Core Properties #
-nifi.version=0.1.0
+nifi.version=0.5.0
 nifi.flow.configuration.file=./conf/config.yml
 nifi.administrative.yield.duration=30 sec
 # If a component has no work to do (is "bored"), how long should we wait 
before checking again for work?

http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/591445e6/docker/DockerVerify.sh
--
diff --git a/docker/DockerVerify.sh b/docker/DockerVerify.sh
index 0707a12..99de193 100755
--- a/docker/DockerVerify.sh
+++ b/docker/DockerVerify.sh
@@ -47,7 +47,7 @@ pip install --upgrade \
 m2crypto \
 watchdog
 
-export MINIFI_VERSION=0.4.0
+export MINIFI_VERSION=0.5.0
 export PYTHONPATH="${PYTHONPATH}:${docker_dir}/test/integration"
 
 exec pytest -s -v

[nifi-minifi-cpp] Git Push Summary

2018-01-27 Thread aldrin 
Repository: nifi-minifi-cpp
Updated Tags:  refs/tags/rel/minifi-cpp-0.4.0 [created] 18b41567d

svn commit: r24490 - /dev/nifi/nifi-minifi-cpp/0.4.0/ /release/nifi/nifi-minifi-cpp/0.4.0/

2018-01-27 Thread aldrin 
Author: aldrin
Date: Sat Jan 27 18:20:51 2018
New Revision: 24490

Log:
MINIFICPP-379 

Added:
release/nifi/nifi-minifi-cpp/0.4.0/
  - copied from r24489, dev/nifi/nifi-minifi-cpp/0.4.0/
Removed:
dev/nifi/nifi-minifi-cpp/0.4.0/