From 8eb6cd421a631262f0230b601013c64c1b22bcb8 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Tue, 10 Feb 2015 15:23:23 +0900 Subject: [PATCH 1/2] prepare 1.1.0-SNAPSHOT --- .../com/navercorp/pinpoint/common/Version.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/commons/src/main/java/com/navercorp/pinpoint/common/Version.java b/commons/src/main/java/com/navercorp/pinpoint/common/Version.java index 695adfdba..2279d0e66 100644 --- a/commons/src/main/java/com/navercorp/pinpoint/common/Version.java +++ b/commons/src/main/java/com/navercorp/pinpoint/common/Version.java @@ -1,20 +1,4 @@ -/* - * Copyright 2014 NAVER Corp. - * - * 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 - * - * 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.navercorp.pinpoint.common; public final class Version { - public static final String VERSION = "1.0.4-SNAPSHOT"; + public static final String VERSION = "1.1.0-SNAPSHOT"; } \ No newline at end of file From eca554c0a72a0f37dd97d37f0b1f52cfa38dd726 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Tue, 10 Feb 2015 15:49:24 +0900 Subject: [PATCH 2/2] added *.iml --- test/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/test/.gitignore b/test/.gitignore index 8bd3a0588..8c2d47305 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -2,3 +2,4 @@ /.settings/ /.classpath /.project +/*.iml