Skip to content

Commit

Permalink
style(*): OpDemand is now Engine Yard
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Apr 13, 2015
1 parent c558ea0 commit 607d6e3
Show file tree
Hide file tree
Showing 26 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
8 changes: 4 additions & 4 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 - <[email protected]> ([@johanneswuerbach](https://github.com/johanneswuerbach))
* Manuel de Brito Fontes - <[email protected]> ([@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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion builder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cache/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cache/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion client/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controller/web/templates/web/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion database/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion database/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deisctl/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion deisctl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions docs/contributing/community.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
2 changes: 1 addition & 1 deletion docs/theme/deis/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion logger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion publisher/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion registry/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion registry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion router/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion store/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion store/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/mock-store/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 607d6e3

Please sign in to comment.