Permalink
Browse files

Merge branch 'master' of repo.newrelic.com:/git/ruby_agent into 3.0.0…

…_dev
  • Loading branch information...
dswanson committed May 3, 2011
2 parents a96e334 + 859213a commit 0a39a220d31fcbd16f925ba4d5f020c433cdba34
Showing with 5 additions and 5 deletions.
  1. +3 −3 lib/new_relic/recipes.rb
  2. +2 −2 ui/views/layouts/newrelic_default.rhtml
View
@@ -4,16 +4,16 @@
# require 'new_relic/recipes'
# to your deploy.rb
#
-# Defined deploy:notify_rpm which will send information about the deploy to RPM.
+# Defined deploy:notify_rpm which will send information about the deploy to New Relic.
# The task will run on app servers except where no_release is true.
# If it fails, it will not affect the task execution or do a rollback.
#
make_notify_task = Proc.new do
namespace :newrelic do
- # on all deployments, notify RPM
- desc "Record a deployment in New Relic RPM (rpm.newrelic.com)"
+ # on all deployments, notify New Relic
+ desc "Record a deployment in New Relic (rpm.newrelic.com)"
task :notice_deployment, :roles => :app, :except => {:no_release => true } do
rails_env = fetch(:newrelic_rails_env, fetch(:rails_env, "production"))
require File.join(File.dirname(__FILE__), 'command.rb')
@@ -2,7 +2,7 @@
xml:lang="en" lang="en">
<head>
<script type="text/javascript" src="/newrelic/file/javascript/jquery-1.4.2.js"></script>
-<title>New Relic RPM Developer Mode</title>
+<title>New Relic Developer Mode</title>
<link href="/newrelic/file/stylesheets/style.css"
media="screen" rel="stylesheet" type="text/css" />
</head>
@@ -12,7 +12,7 @@
<table width="100%" height="60">
<tr>
<td valign="middle">
- <a href='/newrelic'><img src="/newrelic/file/images/new_relic_rpm_desktop.gif" hspace="10" alt="New Relic RPM"/></a>
+ <a href='/newrelic'><img src="/newrelic/file/images/new_relic_rpm_desktop.gif" hspace="10" alt="New Relic"/></a>
</td>
<td class="top_nav" valign="bottom">
<ul id="navlist">

0 comments on commit 0a39a22

Please sign in to comment.