Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Conflicts:
contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb
contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/5d374f26
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/5d374f26
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/5d374f26
Branch: refs/heads/master
Commit: 5d374f26bd9793ed30606d1e4a0f1fa92d2541a6
Parents: ba16d20 b250ead
Author: Aaron McCurry <[email protected]>
Authored: Mon Sep 9 13:12:01 2013 -0400
Committer: Aaron McCurry <[email protected]>
Committed: Mon Sep 9 13:12:01 2013 -0400
----------------------------------------------------------------------
contrib/blur-console/blur-admin/Gemfile.lock | 6 +-
.../app/assets/javascripts/blur_table/table.js | 2 +-
.../templates/blur_table/hosts.jst.ejs | 30 +-
.../templates/blur_table/schema.jst.ejs | 7 +-
.../blur-admin/app/models/blur_query.rb | 4 +-
.../blur-admin/app/models/blur_table.rb | 16 +-
.../blur-admin/app/models/search.rb | 14 +-
.../config/initializers/blur_instrumentation.rb | 43 +
...031155_change_blur_queries_uuid_to_string.rb | 1 -
...4130250_increase_size_of_query_times_json.rb | 31 +-
.../blur-console/blur-admin/lib/thrift/blur.rb | 2825 +++++++++++-------
.../blur-admin/lib/thrift/blur_constants.rb | 20 +-
.../blur-admin/lib/thrift/blur_types.rb | 1249 ++++----
.../collectors/blur/table/SchemaCollector.java | 6 +-
.../org/apache/blur/agent/types/Column.java | 2 +-
15 files changed, 2599 insertions(+), 1657 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d374f26/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb
----------------------------------------------------------------------
diff --cc
contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb
index 985e8ad,08613ae..458f5a0
---
a/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb
+++
b/contrib/blur-console/blur-admin/db/migrate/20130829031155_change_blur_queries_uuid_to_string.rb
@@@ -1,20 -1,17 +1,19 @@@
-# 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.
+# 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.
-
class ChangeBlurQueriesUuidToString < ActiveRecord::Migration
def up
change_column :blur_queries, :uuid, :string
