incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From twilli...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur
Date Thu, 13 Jun 2013 02:30:42 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-blur


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/20a93dd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/20a93dd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/20a93dd2

Branch: refs/heads/master
Commit: 20a93dd2292752ee5c2755b012d2a010511b8c9b
Parents: ae06ddf a1d7fa1
Author: twilliams <twilliams@apache.org>
Authored: Wed Jun 12 22:29:38 2013 -0400
Committer: twilliams <twilliams@apache.org>
Committed: Wed Jun 12 22:29:38 2013 -0400

----------------------------------------------------------------------
 contrib/blur-console/README                     |   8 -
 contrib/blur-console/blur-admin/Gemfile         |  28 +--
 contrib/blur-console/blur-admin/Gemfile.lock    |  17 ++
 contrib/blur-console/blur-admin/Rakefile        |  19 ++
 contrib/blur-console/blur-admin/Regression.md   |  90 ----------
 .../blur-admin/app/views/audits/index.html.haml |  18 ++
 .../views/blur_queries/_blur_query.html.haml    |  18 ++
 .../app/views/blur_queries/_show.html.haml      |  18 ++
 .../app/views/blur_queries/index.html.haml      |  18 ++
 .../app/views/blur_tables/index.html.haml       |  18 ++
 .../app/views/errors/error_404.html.haml        |  18 ++
 .../app/views/errors/error_422.html.haml        |  18 ++
 .../app/views/errors/error_500.html.haml        |  18 ++
 .../blur-admin/app/views/hdfs/_expand.html.haml |  18 ++
 .../app/views/hdfs/_file_info.html.haml         |  18 ++
 .../app/views/hdfs/_folder_info.html.haml       |  18 ++
 .../blur-admin/app/views/hdfs/_info.html.haml   |  18 ++
 .../blur-admin/app/views/hdfs/_upload.html.haml |  18 ++
 .../app/views/hdfs/_upload_form.html.haml       |  18 ++
 .../blur-admin/app/views/hdfs/index.html.haml   |  18 ++
 .../views/hdfs_metrics/_hdfs_graph.html.haml    |  18 ++
 .../hdfs_metrics/_hdfs_joined_graph.html.haml   |  18 ++
 .../app/views/hdfs_metrics/index.html.haml      |  18 ++
 .../app/views/layouts/_help_menu.html.haml      |  18 ++
 .../app/views/layouts/application.html.haml     | 176 ++++++++++---------
 .../app/views/searches/_saved.html.haml         |  44 +++--
 .../app/views/searches/create.html.haml         |  18 ++
 .../app/views/searches/index.html.haml          |  18 ++
 .../app/views/shared/_icons.html.haml           |  18 ++
 .../app/views/user_sessions/_form.html.haml     |  18 ++
 .../app/views/user_sessions/new.html.haml       |  22 ++-
 .../blur-admin/app/views/users/_form.html.haml  |  84 +++++----
 .../blur-admin/app/views/users/edit.html.haml   |  18 ++
 .../blur-admin/app/views/users/index.html.haml  |  74 +++++---
 .../blur-admin/app/views/users/new.html.haml    |  34 +++-
 .../blur-admin/app/views/users/show.html.haml   |  18 ++
 .../app/views/zookeepers/_hdfs_stat.html.haml   |  18 ++
 .../app/views/zookeepers/_zookeeper.html.haml   |  18 ++
 .../app/views/zookeepers/index.html.haml        |  18 ++
 .../app/views/zookeepers/show.html.haml         |  18 ++
 contrib/blur-console/blur-admin/config.ru       |  18 ++
 .../blur-console/blur-admin/config/database.yml |  42 ++---
 .../blur-admin/config/locales/en.yml            |  18 ++
 .../20110524204140_create_blur_tables.rb        |  17 ++
 .../migrate/20110524213803_create_hdfs_stats.rb |  17 ++
 .../20110525015557_create_blur_queries.rb       |  17 ++
 ...26003150_add_extra_columns_to_blur_tables.rb |  17 ++
 ...193123_add_filter_columns_to_blur_queries.rb |  17 ++
 .../20110526201313_modify_fetch_column_name.rb  |  17 ++
 .../20110602014308_add_selector_columns.rb      |  17 ++
 ...20110603004748_add_userid_to_blur_queries.rb |  17 ++
 .../db/migrate/20110607191131_create_users.rb   |  17 ++
 .../20110613135529_add_roles_mask_to_users.rb   |  17 ++
 ...614201547_add_count_column_to_blur_tables.rb |  17 ++
 ...16133049_add_status_column_to_blur_tables.rb |  17 ++
 ...40116_add_agentdata_column_to_blur_tables.rb |  17 ++
 .../migrate/20110617142244_fix_table_types.rb   |  17 ++
 .../20110617163052_change_schema_column.rb      |  17 ++
 ...02105_add_table_id_column_to_blur_queries.rb |  17 ++
 ...emove_table_name_column_from_blur_queries.rb |  17 ++
 ...621225406_create_blur_zookeeper_instances.rb |  17 ++
 .../20110621225838_create_controllers.rb        |  17 ++
 .../migrate/20110621230243_create_clusters.rb   |  17 ++
 .../db/migrate/20110621230340_create_shards.rb  |  17 ++
 ...pdate_columns_on_blur_zookeeper_instances.rb |  17 ++
 ...0_add_status_column_to_zookeeper_instance.rb |  17 ++
 .../20110627180604_change_uuid_columntoint.rb   |  17 ++
 .../20110627183020_change_uuid_int_to_bigint.rb |  17 ++
 ...0801_change_cluster_to_belong_to_instance.rb |  17 ++
 ...me_blur_zookeeper_instances_to_zookeepers.rb |  17 ++
 ...0161453_rename_blur_zookeeper_instance_id.rb |  17 ++
 ..._change_blur_table_current_size_to_bigint.rb |  17 ++
 .../migrate/20110701185350_create_searches.rb   |  17 ++
 ...0110705170021_change_columnsto_textobject.rb |  17 ++
 ...191234_add_column_shard_id_to_blur_tables.rb |  17 ++
 ...707132418_create_shards_blur_tables_table.rb |  17 ++
 ...pdate_model_with_new_understand_of_shards.rb |  17 ++
 .../20110713141138_create_preferences.rb        |  17 ++
 ...adding_useridto_the_model_for_association.rb |  17 ++
 .../20110719191147_create_metrics_table.rb      |  17 ++
 .../20110726194727_add_columns_to_hdfs_stats.rb |  17 ++
 .../db/migrate/20110727012928_create_hdfs.rb    |  17 ++
 .../migrate/20110727013041_update_hdfs_stats.rb |  17 ++
 ...0809202748_add_host_and_port_to_zookeeper.rb |  17 ++
 ...0110810141028_add_row_count_to_blur_table.rb |  17 ++
 .../20110810142348_change_blur_queries_model.rb |  17 ++
 ...110929222508_add_live_nodes_to_hdfs_stats.rb |  17 ++
 ...0929224549_update_hdfs_stats_column_sizes.rb |  17 ++
 .../migrate/20111001193840_add_license_table.rb |  17 ++
 .../db/migrate/20111002175546_add_indexes.rb    |  17 ++
 .../20111011041727_remove_extra_columns.rb      |  17 ++
 .../20111015191154_add_name_column_to_users.rb  |  17 ++
 ...0111030120201_remove_node_location_column.rb |  17 ++
 ...11030120430_increase_size_of_query_column.rb |  17 ++
 .../20111130011338_change_host_port_to_url.rb   |  17 ++
 .../20111219160043_add_record_only_to_search.rb |  17 ++
 ...29213416_change_licenses_to_add_node_info.rb |  17 ++
 .../20120110024452_update_license_table.rb      |  17 ++
 ...20226002653_change_blur_tables_updated_at.rb |  17 ++
 .../db/migrate/20120309015311_add_safe_mode.rb  |  17 ++
 ...604180240_add_record_only_to_blur_queries.rb |  17 ++
 ...ange_query_string_to_medium_text_datatype.rb |  17 ++
 ...5024_change_type_to_smaller_size_med_text.rb |  17 ++
 ...155420_add_comments_column_to_blur_tables.rb |  17 ++
 .../db/migrate/20120807191217_create_audits.rb  |  17 ++
 ...07192046_change_audit_integers_to_strings.rb |  17 ++
 .../20120808182829_change_user_to_user_id.rb    |  17 ++
 ...2325_change_used_to_both_logical_and_real.rb |  17 ++
 ...219_fix_integer_length_for_logical_column.rb |  17 ++
 ...0820073548_update_collation_on_all_tables.rb |  17 ++
 ...333_change_controllersto_blur_controllers.rb |  17 ++
 ...20120824174553_change_shardto_blur_shards.rb |  17 ++
 .../20120827172222_add_zookeeper_to_audits.rb   |  17 ++
 .../20120926202222_add_pre_filter_to_search.rb  |  17 ++
 .../20120926202240_add_post_filter_to_search.rb |  17 ++
 .../20121025175857_add_online_ensemble_nodes.rb |  17 ++
 ...1030184429_add_timestamps_to_blur_objects.rb |  17 ++
 ...1220193623_add_admin_conifgurations_table.rb |  17 ++
 .../20130106191159_rename_status_columns.rb     |  17 ++
 .../20130505151503_drop_licenses_table.rb       |  17 ++
 .../blur-console/blur-admin/doc/README_FOR_APP  |   2 -
 .../blur-console/blur-admin/lib/assets/.gitkeep |   0
 .../blur-console/blur-admin/lib/tasks/.gitkeep  |   0
 .../blur-admin/lib/tasks/coverage.rake          |  18 ++
 .../blur-admin/lib/tasks/pounder.rake           |  18 ++
 .../blur-console/blur-admin/public/robots.txt   |  18 ++
 .../blur-console/blur-admin/spec/rspec-help.txt |   8 -
 .../vendor/assets/javascripts/.gitkeep          |   0
 .../javascripts/backbone/backbone-extension.js  |  17 ++
 .../javascripts/bootstrap-modal-helper.js       |  17 ++
 .../vendor/assets/javascripts/flash_message.js  |  17 ++
 .../assets/javascripts/jquery.osxFinder.js      |  17 ++
 .../assets/stylesheets/jquery.osxFinder.css     |  17 ++
 .../blur-admin/vendor/plugins/.gitkeep          |   0
 contrib/blur-console/build.sh                   |  15 ++
 contrib/blur-console/etc/VERSION                |  17 ++
 contrib/blur-console/etc/agent.config.sample    |  18 ++
 contrib/blur-console/etc/agent.sh               |  18 ++
 contrib/blur-console/etc/default/Gemfile        |  18 ++
 contrib/blur-console/etc/default/database.yml   |  18 ++
 contrib/blur-console/etc/log4j.properties       |  18 ++
 contrib/blur-console/etc/start-agent.sh         |  18 ++
 contrib/blur-console/etc/stop-agent.sh          |  18 ++
 143 files changed, 2507 insertions(+), 305 deletions(-)
----------------------------------------------------------------------



Mime
View raw message