You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/08/17 04:15:24 UTC

[1/2] incubator-beam git commit: Fixing the juliaset example

Repository: incubator-beam
Updated Branches:
  refs/heads/python-sdk 3b40945e9 -> 600684865


Fixing the juliaset example


Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7f842f23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7f842f23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7f842f23

Branch: refs/heads/python-sdk
Commit: 7f842f233cd035c83ce81fcb8bc9e4d2f6dd09ad
Parents: 3b40945
Author: Ahmet Altay <al...@google.com>
Authored: Tue Aug 16 16:32:07 2016 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Tue Aug 16 16:32:07 2016 -0700

----------------------------------------------------------------------
 .../examples/complete/juliaset/__init__.py          | 16 ++++++++++++++++
 .../examples/complete/juliaset/juliaset_main.py     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7f842f23/sdks/python/apache_beam/examples/complete/juliaset/__init__.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/examples/complete/juliaset/__init__.py b/sdks/python/apache_beam/examples/complete/juliaset/__init__.py
new file mode 100644
index 0000000..cce3aca
--- /dev/null
+++ b/sdks/python/apache_beam/examples/complete/juliaset/__init__.py
@@ -0,0 +1,16 @@
+#
+# 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.
+#

http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7f842f23/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py b/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py
index b7bc6e5..45144cf 100644
--- a/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py
+++ b/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py
@@ -50,7 +50,7 @@ python juliaset_main.py \
 import logging
 
 
-from juliaset import juliaset
+from apache_beam.examples.complete.juliaset.juliaset import juliaset
 
 
 if __name__ == '__main__':


[2/2] incubator-beam git commit: Closes #839

Posted by dh...@apache.org.
Closes #839


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

Branch: refs/heads/python-sdk
Commit: 6006848654f4b66848e49828182b0a3ee632c1fd
Parents: 3b40945 7f842f2
Author: Dan Halperin <dh...@google.com>
Authored: Tue Aug 16 21:15:15 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Aug 16 21:15:15 2016 -0700

----------------------------------------------------------------------
 .../examples/complete/juliaset/__init__.py          | 16 ++++++++++++++++
 .../examples/complete/juliaset/juliaset_main.py     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------