Merge pull request #3480 from mboersma/we-are-engine-yard

mboersma · mboersma · commit 865b07f96688 · 2015-04-14T09:59:27.000-04:00
We are Engine Yard!
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2013, 2014 OpDemand LLC
+Copyright 2013, 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -46,9 +46,9 @@ The duties of a core maintainer include:
 * Answer questions and help users in IRC
 
 The current core maintainers of Deis:
-* Chris Armstrong - <chris@opdemand.com> ([@carmstrong](https://github.com/carmstrong))
-* Matt Boersma - <matt@opdemand.com> ([@mboersma](https://github.com/mboersma))
-* Matthew Fisher - <matthewf@opdemand.com> ([@bacongobbler](https://github.com/bacongobbler))
+* Chris Armstrong - <carmstrong@engineyard.com> ([@carmstrong](https://github.com/carmstrong))
+* Matt Boersma - <mboersma@engineyard.com> ([@mboersma](https://github.com/mboersma))
+* Matthew Fisher - <mfisher@engineyard.com> ([@bacongobbler](https://github.com/bacongobbler))
 
 No pull requests can be merged until at least one core maintainer signs off with a [Code LGTM](http://docs.deis.io/en/latest/contributing/standards/#merge-approval). The other LGTM can come from either a core maintainer
 or contributing maintainer.
@@ -66,7 +66,7 @@ The duties of a contributing maintainer are very similar to those of a core main
 The current contributing maintainers of Deis:
 * Johannes Würbach - <johannes.wuerbach@googlemail.com> ([@johanneswuerbach](https://github.com/johanneswuerbach))
 * Manuel de Brito Fontes - <alejandro.debrito@soficom.cl> ([@aledbf](https://github.com/aledbf))
-* Sivaram Mothiki - <smothiki@opdemand.com> ([@smothiki](https://github.com/smothiki))
+* Sivaram Mothiki - <smothiki@engineyard.com> ([@smothiki](https://github.com/smothiki))
 
 ## Becoming a maintainer
 
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ assistance with common issues.
 
 ## License
 
-Copyright 2013, 2014 OpDemand LLC
+Copyright 2013, 2014 Engine Yard, Inc.
 
 Licensed 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>
 
diff --git a/builder/README.md b/builder/README.md
@@ -26,7 +26,7 @@ install, and start **deis/builder**.
 
 ## License
 
-© 2014 OpDemand LLC
+© 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
diff --git a/builder/image/slugbuilder/Dockerfile b/builder/image/slugbuilder/Dockerfile
@@ -1,5 +1,4 @@
 FROM progrium/cedarish:latest
-MAINTAINER OpDemand <info@opdemand.com>
 
 RUN mkdir /app
 RUN addgroup --quiet --gid 2000 slug && \
@@ -13,4 +12,3 @@ RUN /tmp/builder/install-buildpacks
 ENTRYPOINT ["/tmp/builder/build.sh"]
 
 ENV DEIS_RELEASE 1.6.0-dev
-
diff --git a/builder/image/slugrunner/Dockerfile b/builder/image/slugrunner/Dockerfile
@@ -1,5 +1,4 @@
 FROM progrium/cedarish:latest
-MAINTAINER OpDemand <info@opdemand.com>
 
 RUN mkdir /app
 RUN addgroup --quiet --gid 2000 slug && \
@@ -19,4 +18,3 @@ ENV HOME /app
 ENTRYPOINT ["/runner/init"]
 
 ENV DEIS_RELEASE 1.6.0-dev
-
diff --git a/cache/LICENSE b/cache/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2013, 2014 OpDemand LLC
+Copyright 2013, 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/cache/README.md b/cache/README.md
@@ -26,7 +26,7 @@ install, and start **deis/cache**.
 
 ## License
 
-© 2014 OpDemand LLC
+© 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
diff --git a/client/LICENSE b/client/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2013, 2014 OpDemand LLC
+Copyright 2013, 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/client/README.rst b/client/README.rst
@@ -150,7 +150,7 @@ To learn more, use ``deis help`` or browse `the documentation`_.
 License
 -------
 
-Copyright 2013, OpDemand LLC
+Copyright 2013, Engine Yard, Inc.
 
 Licensed 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
diff --git a/client/setup.py b/client/setup.py
@@ -31,8 +31,8 @@
       version='1.6.0-dev',
       license=APACHE_LICENSE,
       description='Command-line Client for Deis, the open PaaS',
-      author='OpDemand',
-      author_email='info@opdemand.com',
+      author='Engine Yard',
+      author_email='info@deis.io',
       url='https://github.com/deis/deis',
       keywords=[
           'opdemand', 'deis', 'paas', 'cloud', 'coreos', 'docker', 'heroku',
diff --git a/controller/README.md b/controller/README.md
@@ -28,7 +28,7 @@ install, and start **deis/controller**.
 
 ## License
 
-© 2014 OpDemand LLC
+© 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
diff --git a/controller/api/fixtures/test_auth.json b/controller/api/fixtures/test_auth.json
@@ -13,7 +13,7 @@
         "groups": [],
         "user_permissions": [],
         "password": "pbkdf2_sha256$10000$5Uoq7dl61vnN$gQhDpc2q2Rkn16VdPC+pNNEQcKpy+LGe29Zkad+2/m4=",
-        "email": "autotest@opdemand.com",
+        "email": "autotest@deis.io",
         "date_joined": "2013-05-10T16:08:09.357Z"
     }
 }
diff --git a/controller/api/fixtures/test_sharing.json b/controller/api/fixtures/test_sharing.json
@@ -31,7 +31,7 @@
     "groups": [],
     "user_permissions": [],
     "password": "pbkdf2_sha256$10000$SLr4X1T9L3QA$NB4d4a0d+3NZuAwLbdnKGb2z3P/hQrKQHVaGG3zAaMw=",
-    "email": "autotest@opdemand.com",
+    "email": "autotest@deis.io",
     "date_joined": "2013-11-25T21:58:46.208Z"
   }
 },
@@ -49,7 +49,7 @@
     "groups": [],
     "user_permissions": [],
     "password": "pbkdf2_sha256$10000$FrfwTVAtWPMD$HUfDokMeY37YshdyS3uhDZ+d/r8galU7kNuBfZxJl2s=",
-    "email": "autotest@opdemand.com",
+    "email": "autotest@deis.io",
     "date_joined": "2013-11-25T21:59:30.760Z"
   }
 },
diff --git a/controller/api/fixtures/tests.json b/controller/api/fixtures/tests.json
@@ -13,7 +13,7 @@
         "groups": [],
         "user_permissions": [],
         "password": "pbkdf2_sha256$10000$5Uoq7dl61vnN$gQhDpc2q2Rkn16VdPC+pNNEQcKpy+LGe29Zkad+2/m4=",
-        "email": "autotest@opdemand.com",
+        "email": "autotest@deis.io",
         "date_joined": "2013-05-10T16:08:09.357Z"
     }
 },
@@ -31,7 +31,7 @@
         "groups": [],
         "user_permissions": [],
         "password": "pbkdf2_sha256$10000$5Uoq7dl61vnN$gQhDpc2q2Rkn16VdPC+pNNEQcKpy+LGe29Zkad+2/m4=",
-        "email": "autotest2@opdemand.com",
+        "email": "autotest2@deis.io",
         "date_joined": "2013-05-10T16:08:09.357Z"
     }
 }
diff --git a/controller/web/fixtures/test_web.json b/controller/web/fixtures/test_web.json
@@ -31,7 +31,7 @@
     "groups": [],
     "user_permissions": [],
     "password": "pbkdf2_sha256$10000$SLr4X1T9L3QA$NB4d4a0d+3NZuAwLbdnKGb2z3P/hQrKQHVaGG3zAaMw=",
-    "email": "autotest@opdemand.com",
+    "email": "autotest@deis.io",
     "date_joined": "2013-11-25T21:58:46.208Z"
   }
 },
@@ -49,7 +49,7 @@
     "groups": [],
     "user_permissions": [],
     "password": "pbkdf2_sha256$10000$FrfwTVAtWPMD$HUfDokMeY37YshdyS3uhDZ+d/r8galU7kNuBfZxJl2s=",
-    "email": "autotest@opdemand.com",
+    "email": "autotest@deis.io",
     "date_joined": "2013-11-25T21:59:30.760Z"
   }
 },
diff --git a/controller/web/templates/web/base.html b/controller/web/templates/web/base.html
@@ -52,7 +52,7 @@
           </div>
           <div class="byline-menu">
             <span class="cloud-logo"></span>
-            <p>Deis is a project by<br>OpDemand</p>
+            <p>Deis is a project by<br>Engine Yard</p>
           </div>
         </div>
       </div>
diff --git a/database/LICENSE b/database/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2013, 2014 OpDemand LLC
+Copyright 2013, 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/database/README.md b/database/README.md
@@ -38,7 +38,7 @@ install, and start **deis/database**.
 
 ## License
 
-© 2014 OpDemand LLC
+© 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
diff --git a/deisctl/LICENSE b/deisctl/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2014 OpDemand LLC
+Copyright 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/deisctl/README.md b/deisctl/README.md
@@ -208,7 +208,7 @@ deisctl looks for unit files in these directories, in this order:
 
 ## License
 
-Copyright 2014, OpDemand LLC
+Copyright 2014, Engine Yard, Inc.
 
 Licensed 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>
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -55,7 +55,7 @@
 
 # General information about the project.
 project = u'deis'
-copyright = u'2013, 2014 OpDemand LLC'
+copyright = u'2013, 2014 Engine Yard, Inc.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -270,9 +270,9 @@
 
 # Bibliographic Dublin Core info.
 epub_title = u'deis'
-epub_author = u'OpDemand LLC'
-epub_publisher = u'OpDemand LLC'
-epub_copyright = u'2013, OpDemand LLC'
+epub_author = u'Engine Yard, Inc.'
+epub_publisher = u'Engine Yard, Inc.'
+epub_copyright = u'2013, Engine Yard, Inc.'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
diff --git a/docs/contributing/community.rst b/docs/contributing/community.rst
@@ -15,7 +15,7 @@ Deis development is coordinated through its project `on GitHub`_. Anyone can
 check out the source code for Deis, fork the project, make improvements,
 and create a pull request to incorporate those changes into Deis.
 
-`OpDemand`_ maintains the Deis project, and as such decides what
+`Engine Yard`_ maintains the Deis project, and as such decides what
 ends up in the official GitHub repository for Deis. Deis depends on the
 contributions of the community; the maintainers will not ignore pull
 requests or issues.
@@ -36,6 +36,6 @@ but are more than happy to help community members attempting bounties.
 
 
 .. _`on Github`: https://github.com/deis/deis
-.. _`OpDemand`: http://www.opdemand.com/
+.. _`Engine Yard`: https://www.engineyard.com/
 .. _`BDFL`: http://en.wikipedia.org/wiki/Benevolent_Dictator_for_Life
 .. _`Gabriel Monroy`: https://github.com/gabrtv
diff --git a/docs/theme/deis/layout.html b/docs/theme/deis/layout.html
@@ -78,7 +78,7 @@
 
                       <div class="byline-menu">
                           <span class="cloud-logo"></span>
-                          <p>Deis is a project by<br>OpDemand</p>
+                          <p>Deis is a project by<br>Engine Yard</p>
                       </div>
                     </footer>
                 </div>
diff --git a/docs/using_deis/using-dockerfiles.rst b/docs/using_deis/using-dockerfiles.rst
@@ -56,41 +56,38 @@ Use ``git push deis master`` to deploy your application.
     Uploading context
     Step 0 : FROM deis/base:latest
      ---> 60024338bc63
-    Step 1 : MAINTAINER OpDemand <info@opdemand.com>
-     ---> Using cache
-     ---> 2af5ad7f28d6
-    Step 2 : RUN wget -O /tmp/go1.2.1.linux-amd64.tar.gz -q https://go.googlecode.com/files/go1.2.1.linux-amd64.tar.gz
+    Step 1 : RUN wget -O /tmp/go1.2.1.linux-amd64.tar.gz -q https://go.googlecode.com/files/go1.2.1.linux-amd64.tar.gz
      ---> Using cache
      ---> cf9ef8c5caa7
-    Step 3 : RUN tar -C /usr/local -xzf /tmp/go1.2.1.linux-amd64.tar.gz
+    Step 2 : RUN tar -C /usr/local -xzf /tmp/go1.2.1.linux-amd64.tar.gz
      ---> Using cache
      ---> 515b1faf3bd8
-    Step 4 : RUN mkdir -p /go
+    Step 3 : RUN mkdir -p /go
      ---> Using cache
      ---> ebf4927a00e9
-    Step 5 : ENV GOPATH /go
+    Step 4 : ENV GOPATH /go
      ---> Using cache
      ---> c6a276eded37
-    Step 6 : ENV PATH /usr/local/go/bin:/go/bin:$PATH
+    Step 5 : ENV PATH /usr/local/go/bin:/go/bin:$PATH
      ---> Using cache
      ---> 2ba6f6c9f108
-    Step 7 : ADD . /go/src/github.com/deis/helloworld
+    Step 6 : ADD . /go/src/github.com/deis/helloworld
      ---> 94ab7f4b977b
     Removing intermediate container 171b7d9fdb34
-    Step 8 : RUN cd /go/src/github.com/deis/helloworld && go install -v .
+    Step 7 : RUN cd /go/src/github.com/deis/helloworld && go install -v .
      ---> Running in 0c8fbb2d2812
     github.com/deis/helloworld
      ---> 13b5af931393
     Removing intermediate container 0c8fbb2d2812
-    Step 9 : ENV PORT 80
+    Step 8 : ENV PORT 80
      ---> Running in 9b07da36a272
      ---> 2dce83167874
     Removing intermediate container 9b07da36a272
-    Step 10 : CMD ["/go/bin/helloworld"]
+    Step 9 : CMD ["/go/bin/helloworld"]
      ---> Running in f7b215199940
      ---> b1e55ce5195a
     Removing intermediate container f7b215199940
-    Step 11 : EXPOSE 80
+    Step 10 : EXPOSE 80
      ---> Running in 7eb8ec45dcb0
      ---> ea1a8cc93ca3
     Removing intermediate container 7eb8ec45dcb0
diff --git a/logger/README.md b/logger/README.md
@@ -26,7 +26,7 @@ install, and start **deis/logger**.
 
 ## License
 
-© 2014 OpDemand LLC
+© 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
diff --git a/logspout/image/Dockerfile b/logspout/image/Dockerfile
@@ -1,5 +1,4 @@
 FROM busybox
-MAINTAINER OpDemand <info@opdemand.com>
 
 ENV DOCKER_HOST unix:///tmp/docker.sock
 ENV ROUTESPATH /tmp
@@ -8,4 +7,3 @@ CMD ["/bin/logspout"]
 ADD logspout /bin/logspout
 
 ENV DEIS_RELEASE 1.6.0-dev
-
diff --git a/publisher/LICENSE b/publisher/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2014 OpDemand LLC
+Copyright 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/registry/LICENSE b/registry/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2013, 2014 OpDemand LLC
+Copyright 2013, 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/registry/README.md b/registry/README.md
@@ -29,7 +29,7 @@ install, and start **deis/registry**.
 
 ## License
 
-© 2014 OpDemand LLC
+© 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
diff --git a/router/README.md b/router/README.md
@@ -43,7 +43,7 @@ Only these modules are enabled:
 
 ## License
 
-© 2014 OpDemand LLC
+© 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
diff --git a/store/LICENSE b/store/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2014 OpDemand LLC
+Copyright 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/store/README.md b/store/README.md
@@ -35,7 +35,7 @@ install, and start **deis/store**.
 
 ## License
 
-© 2014 OpDemand LLC
+© 2014 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain
diff --git a/tests/fixtures/mock-store/README.md b/tests/fixtures/mock-store/README.md
@@ -32,7 +32,7 @@ Run `make mock-store` from the tests/ directory to update the Docker image used
 
 ## License
 
-© 2015 OpDemand LLC
+© 2015 Engine Yard, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright 2013, 2014 OpDemand LLC`
	`1`	`+Copyright 2013, 2014 Engine Yard, Inc.`
`2`	`2`
`3`	`3`	`Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`you may not use this file except in compliance with the License.`