summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2015-08-31 17:32:21 +0300
committerMichael Klishin <mklishin@pivotal.io>2015-08-31 17:32:21 +0300
commit09af3f6fd57fa065d3b14789edebb4d36cdcca62 (patch)
tree7bf68209aacec03e45b2a105f8920476a6013061 /include
parent2e2afaecd326ffcb5c8fd43a08a83aa92126a5ed (diff)
parent7b2dabafb1ce73c47e0f8b1c1e1d775ca51bb3e3 (diff)
downloadrabbitmq-server-git-09af3f6fd57fa065d3b14789edebb4d36cdcca62.tar.gz
Merge stable into master
Diffstat (limited to 'include')
-rw-r--r--include/gm_specs.hrl2
-rw-r--r--include/rabbit.hrl2
-rw-r--r--include/rabbit_cli.hrl2
-rw-r--r--include/rabbit_msg_store.hrl2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/gm_specs.hrl b/include/gm_specs.hrl
index 5a98e7059b..bc20b4415d 100644
--- a/include/gm_specs.hrl
+++ b/include/gm_specs.hrl
@@ -10,7 +10,7 @@
%%
%% The Original Code is RabbitMQ.
%%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
%%
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 9ad99a754a..6c3b131b34 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -10,7 +10,7 @@
%%
%% The Original Code is RabbitMQ.
%%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
%%
diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl
index 1bffc9a604..737bb4ea3d 100644
--- a/include/rabbit_cli.hrl
+++ b/include/rabbit_cli.hrl
@@ -10,7 +10,7 @@
%%
%% The Original Code is RabbitMQ.
%%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
%%
diff --git a/include/rabbit_msg_store.hrl b/include/rabbit_msg_store.hrl
index 803ed6b7ce..8bcf2ce629 100644
--- a/include/rabbit_msg_store.hrl
+++ b/include/rabbit_msg_store.hrl
@@ -10,7 +10,7 @@
%%
%% The Original Code is RabbitMQ.
%%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
+%% The Initial Developer of the Original Code is Pivotal Software, Inc.
%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved.
%%