You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by ik...@apache.org on 2016/04/21 02:02:19 UTC

[02/52] [abbrv] incubator-omid git commit: Updated source code with license header

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/transaction/CommitTimestampLocator.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/transaction/CommitTimestampLocator.java b/transaction-client/src/main/java/com/yahoo/omid/transaction/CommitTimestampLocator.java
index debbb14..13399c5 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/transaction/CommitTimestampLocator.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/transaction/CommitTimestampLocator.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/transaction/PostCommitActions.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/transaction/PostCommitActions.java b/transaction-client/src/main/java/com/yahoo/omid/transaction/PostCommitActions.java
index 88bf7a5..30b51f2 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/transaction/PostCommitActions.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/transaction/PostCommitActions.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/transaction/RollbackException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/transaction/RollbackException.java b/transaction-client/src/main/java/com/yahoo/omid/transaction/RollbackException.java
index 7dfc2d0..1cd1176 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/transaction/RollbackException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/transaction/RollbackException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/transaction/Transaction.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/transaction/Transaction.java b/transaction-client/src/main/java/com/yahoo/omid/transaction/Transaction.java
index 5baad1f..a10e2d3 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/transaction/Transaction.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/transaction/Transaction.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionException.java b/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionException.java
index 0786638..f238a6b 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManager.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManager.java b/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManager.java
index ae19bc0..d5782fa 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManager.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManager.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManagerException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManagerException.java b/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManagerException.java
index 7931b68..09df8da 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManagerException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/transaction/TransactionManagerException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tso/util/DummyCellIdImpl.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tso/util/DummyCellIdImpl.java b/transaction-client/src/main/java/com/yahoo/omid/tso/util/DummyCellIdImpl.java
index 6f9ed76..600dc51 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tso/util/DummyCellIdImpl.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tso/util/DummyCellIdImpl.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/AbortException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/AbortException.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/AbortException.java
index 55351f2..5a4d43c 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/AbortException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/AbortException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/CellId.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/CellId.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/CellId.java
index df5ab91..eab757e 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/CellId.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/CellId.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ClosingException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ClosingException.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ClosingException.java
index d5ac476..d257deb 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ClosingException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ClosingException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ConnectionException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ConnectionException.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ConnectionException.java
index 03ea7e0..e20dd06 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ConnectionException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ConnectionException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ForwardingTSOFuture.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ForwardingTSOFuture.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ForwardingTSOFuture.java
index 886070a..a2b889e 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ForwardingTSOFuture.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ForwardingTSOFuture.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/HandshakeFailedException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/HandshakeFailedException.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/HandshakeFailedException.java
index 73972bf..dc28656 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/HandshakeFailedException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/HandshakeFailedException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/MockTSOClient.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/MockTSOClient.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/MockTSOClient.java
index c528d05..a3e5653 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/MockTSOClient.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/MockTSOClient.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/NewTSOException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/NewTSOException.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/NewTSOException.java
index 982c8c4..735f51c 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/NewTSOException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/NewTSOException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/OmidClientConfiguration.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/OmidClientConfiguration.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/OmidClientConfiguration.java
index 56f0c5e..566964a 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/OmidClientConfiguration.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/OmidClientConfiguration.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ServiceUnavailableException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ServiceUnavailableException.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ServiceUnavailableException.java
index e3b93c9..2f8717e 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ServiceUnavailableException.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/ServiceUnavailableException.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOClient.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOClient.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOClient.java
index 1d5170f..dcfa6ca 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOClient.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOClient.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOFuture.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOFuture.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOFuture.java
index 5690f6f..0999065 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOFuture.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOFuture.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOProtocol.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOProtocol.java b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOProtocol.java
index ebdd1e8..553a15c 100644
--- a/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOProtocol.java
+++ b/transaction-client/src/main/java/com/yahoo/omid/tsoclient/TSOProtocol.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestMockTSOClient.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestMockTSOClient.java b/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestMockTSOClient.java
index d17b21f..5ea5ffb 100644
--- a/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestMockTSOClient.java
+++ b/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestMockTSOClient.java
@@ -1,3 +1,20 @@
+/**
+ * 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.
+ */
 package com.yahoo.omid.tsoclient;
 
 import com.google.common.collect.Sets;

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestOmidClientConfiguration.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestOmidClientConfiguration.java b/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestOmidClientConfiguration.java
index 92e913d..497ec6d 100644
--- a/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestOmidClientConfiguration.java
+++ b/transaction-client/src/test/java/com/yahoo/omid/tsoclient/TestOmidClientConfiguration.java
@@ -1,3 +1,20 @@
+/**
+ * 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.
+ */
 package com.yahoo.omid.tsoclient;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/Cache.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/Cache.java b/tso-server/src/main/java/com/yahoo/omid/tso/Cache.java
index 238823c..4fac4c5 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/Cache.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/Cache.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/CacheEvaluation.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/CacheEvaluation.java b/tso-server/src/main/java/com/yahoo/omid/tso/CacheEvaluation.java
index 99f0e9b..fd9b6d7 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/CacheEvaluation.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/CacheEvaluation.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/CommitHashMap.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/CommitHashMap.java b/tso-server/src/main/java/com/yahoo/omid/tso/CommitHashMap.java
index e132233..74bfa52 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/CommitHashMap.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/CommitHashMap.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/DisruptorModule.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/DisruptorModule.java b/tso-server/src/main/java/com/yahoo/omid/tso/DisruptorModule.java
index b60c630..7aa1e4f 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/DisruptorModule.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/DisruptorModule.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/FatalExceptionHandler.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/FatalExceptionHandler.java b/tso-server/src/main/java/com/yahoo/omid/tso/FatalExceptionHandler.java
index 7f11b44..a044b04 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/FatalExceptionHandler.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/FatalExceptionHandler.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/HALeaseManagementModule.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/HALeaseManagementModule.java b/tso-server/src/main/java/com/yahoo/omid/tso/HALeaseManagementModule.java
index 4b40c92..5582861 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/HALeaseManagementModule.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/HALeaseManagementModule.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryCommitTableStorageModule.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryCommitTableStorageModule.java b/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryCommitTableStorageModule.java
index fa6fb28..98d8261 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryCommitTableStorageModule.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryCommitTableStorageModule.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryTimestampStorageModule.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryTimestampStorageModule.java b/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryTimestampStorageModule.java
index 5c5309d..be1c3fc 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryTimestampStorageModule.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/InMemoryTimestampStorageModule.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManagement.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManagement.java b/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManagement.java
index fae744e..8736f8d 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManagement.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManagement.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManager.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManager.java b/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManager.java
index 2749ad3..e6ff7f1 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManager.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/LeaseManager.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/LongCache.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/LongCache.java b/tso-server/src/main/java/com/yahoo/omid/tso/LongCache.java
index 9099552..e140d50 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/LongCache.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/LongCache.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/MockPanicker.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/MockPanicker.java b/tso-server/src/main/java/com/yahoo/omid/tso/MockPanicker.java
index b41fd08..aec6141 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/MockPanicker.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/MockPanicker.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/MonitoringContext.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/MonitoringContext.java b/tso-server/src/main/java/com/yahoo/omid/tso/MonitoringContext.java
index 64ef45c..c52e96a 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/MonitoringContext.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/MonitoringContext.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/NetworkInterfaceUtils.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/NetworkInterfaceUtils.java b/tso-server/src/main/java/com/yahoo/omid/tso/NetworkInterfaceUtils.java
index ed648e4..7a32f1e 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/NetworkInterfaceUtils.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/NetworkInterfaceUtils.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/Panicker.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/Panicker.java b/tso-server/src/main/java/com/yahoo/omid/tso/Panicker.java
index cf87b14..47860ae 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/Panicker.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/Panicker.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/PausableTimestampOracle.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/PausableTimestampOracle.java b/tso-server/src/main/java/com/yahoo/omid/tso/PausableTimestampOracle.java
index d5b6f01..98be866 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/PausableTimestampOracle.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/PausableTimestampOracle.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessor.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessor.java b/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessor.java
index 77a1c72..4aa7b51 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessor.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessor.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessorImpl.java b/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessorImpl.java
index 674416a..2b46b86 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessorImpl.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/PersistenceProcessorImpl.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessor.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessor.java b/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessor.java
index 6b31865..f0788ed 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessor.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessor.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessorImpl.java b/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessorImpl.java
index 41e0b88..a69700d 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessorImpl.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/ReplyProcessorImpl.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessor.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessor.java b/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessor.java
index 8b5eaaf..2870cb7 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessor.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessor.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessorImpl.java b/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessorImpl.java
index ba5f76f..6194b2e 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessorImpl.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/RequestProcessorImpl.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessor.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessor.java b/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessor.java
index 67d7790..70309b9 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessor.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessor.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessorImpl.java b/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessorImpl.java
index a36d8ae..13fbe2d 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessorImpl.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/RetryProcessorImpl.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/SystemExitPanicker.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/SystemExitPanicker.java b/tso-server/src/main/java/com/yahoo/omid/tso/SystemExitPanicker.java
index afd60f6..7cfd77a 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/SystemExitPanicker.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/SystemExitPanicker.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TSOChannelHandler.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TSOChannelHandler.java b/tso-server/src/main/java/com/yahoo/omid/tso/TSOChannelHandler.java
index 129474d..ac6abae 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TSOChannelHandler.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TSOChannelHandler.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TSOModule.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TSOModule.java b/tso-server/src/main/java/com/yahoo/omid/tso/TSOModule.java
index cfa1479..3321ef7 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TSOModule.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TSOModule.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TSOServer.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TSOServer.java b/tso-server/src/main/java/com/yahoo/omid/tso/TSOServer.java
index 69ffaf7..94e1e34 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TSOServer.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TSOServer.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TSOServerConfig.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TSOServerConfig.java b/tso-server/src/main/java/com/yahoo/omid/tso/TSOServerConfig.java
index ece75b1..c20f7a7 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TSOServerConfig.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TSOServerConfig.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManager.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManager.java b/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManager.java
index 47722ad..62af975 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManager.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManager.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManagerImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManagerImpl.java b/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManagerImpl.java
index 9487a8c..091dc8b 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManagerImpl.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TSOStateManagerImpl.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracle.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracle.java b/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracle.java
index 2df6671..4ebf2c6 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracle.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracle.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracleImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracleImpl.java b/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracleImpl.java
index 6b3d209..6e196d3 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracleImpl.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TimestampOracleImpl.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/TsoServerDaemon.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/TsoServerDaemon.java b/tso-server/src/main/java/com/yahoo/omid/tso/TsoServerDaemon.java
index b9db756..345aa83 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/TsoServerDaemon.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/TsoServerDaemon.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManagementModule.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManagementModule.java b/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManagementModule.java
index 48cb747..7677756 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManagementModule.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManagementModule.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManager.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManager.java b/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManager.java
index e75d548..3005947 100644
--- a/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManager.java
+++ b/tso-server/src/main/java/com/yahoo/omid/tso/VoidLeaseManager.java
@@ -1,11 +1,13 @@
 /**
- * Copyright 2011-2016 Yahoo Inc.
+ * 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
  *
- * 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
+ *   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,

http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0f13d2ad/tso-server/src/test/java/com/yahoo/omid/TestUtils.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/com/yahoo/omid/TestUtils.java b/tso-server/src/test/java/com/yahoo/omid/TestUtils.java
index 9068e3b..7c30691 100644
--- a/tso-server/src/test/java/com/yahoo/omid/TestUtils.java
+++ b/tso-server/src/test/java/com/yahoo/omid/TestUtils.java
@@ -1,3 +1,20 @@
+/**
+ * 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.
+ */
 package com.yahoo.omid;
 
 import org.apache.commons.io.IOUtils;